From ccfcc9008c3926d59ee614f98dd1c0c2a8b737c1 Mon Sep 17 00:00:00 2001 From: Lee Jeffery Date: Sun, 17 May 2015 21:57:10 +0100 Subject: [PATCH] Reuse existing crate_name method instead. --- src/cargo/ops/cargo_doc.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/cargo/ops/cargo_doc.rs b/src/cargo/ops/cargo_doc.rs index 41bf8ca65..63ced9a12 100644 --- a/src/cargo/ops/cargo_doc.rs +++ b/src/cargo/ops/cargo_doc.rs @@ -26,9 +26,9 @@ pub fn doc(manifest_path: &Path, if options.compile_opts.spec.is_none() { for target in package.targets().iter().filter(|t| t.documented()) { if target.is_lib() { - assert!(lib_names.insert(target.name())); + assert!(lib_names.insert(target.crate_name())); } else { - assert!(bin_names.insert(target.name())); + assert!(bin_names.insert(target.crate_name())); } } for bin in bin_names.iter() { @@ -45,7 +45,7 @@ pub fn doc(manifest_path: &Path, if options.open_result { let name = match options.compile_opts.spec { - Some(spec) => try!(PackageIdSpec::parse(spec)).name().to_string(), + Some(spec) => try!(PackageIdSpec::parse(spec)).name().replace("-", "_").to_string(), None => { match lib_names.iter().chain(bin_names.iter()).nth(0) { Some(s) => s.to_string(), @@ -53,7 +53,6 @@ pub fn doc(manifest_path: &Path, } } }; - let name = name.replace("-", "_"); let path = package.absolute_target_dir().join("doc").join(&name) .join("index.html"); -- 2.30.2